didnt change anything
Delete the java package init files
Merge branch 'master' of https://github.com/CMPUT301W14T01/localpost

Conflicts:
	bin/Localpost.apk
	bin/resources.ap_
	project.properties
Merge branch 'master' of https://github.com/CMPUT301W14T01/localpost