Trying large write
Merge branch 'master' of https://github.com/srang/devilFiler

Conflicts:
	src/test/SimpleTest.java