Now makes composr_files directory on start up
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/kenthacks/eric/composr/MyActivity.java