Rebuilding
Merge branch 'master' of https://github.com/srang/devilFiler
Fixing bugs in rebuild
Merge branch 'master' of https://github.com/srang/devilFiler

Conflicts:
	src/test/SimpleTest.java
pushing