Merge branch 'feature-merklehash' into develop
[archipelago] / Makefile
2013-01-29 Filippos GiannakosAdd makefile in top directory