Revert "Initial commit"

This reverts commit 634f067e07b7b960707177772c78f92f959b6ec9.
Merge branch 'master' of https://github.com/louie2107/Locotes

Conflicts:
	Locotes/build/apk/Locotes-debug-unaligned.apk
	Locotes/build/classes/debug/com/usolu/locotes/MainLocotes.class
	Locotes/build/classes/debug/com/usolu/locotes/R$attr.class
	Locotes/build/classes/debug/com/usolu/locotes/R$dimen.class
	Locotes/build/classes/debug/com/usolu/locotes/R$drawable.class
	Locotes/build/classes/debug/com/usolu/locotes/R$id.class
	Locotes/build/classes/debug/com/usolu/locotes/R$layout.class
	Locotes/build/classes/debug/com/usolu/locotes/R$menu.class
	Locotes/build/classes/debug/com/usolu/locotes/R$string.class
	Locotes/build/classes/debug/com/usolu/locotes/R$style.class
	Locotes/build/classes/debug/com/usolu/locotes/R.class
	Locotes/build/incremental/dex/debug/inputs.data
	Locotes/build/incremental/mergeResources/debug/inputs.data
	Locotes/build/incremental/mergeResources/debug/merger.xml
	Locotes/build/incremental/mergeResources/debug/outputs.data
	Locotes/build/libs/Locotes-debug.ap_
	Locotes/build/libs/Locotes-debug.dex
	Locotes/build/manifests/debug/AndroidManifest.xml
	Locotes/build/res/all/debug/layout/locotes_main.xml
	Locotes/build/res/all/debug/menu/main_locotes.xml
	Locotes/build/res/all/debug/values/values.xml
	Locotes/build/source/r/debug/com/usolu/locotes/R.java
	Locotes/src/main/AndroidManifest.xml
	Locotes/src/main/java/com/usolu/locotes/MainLocotes.java
	Locotes/src/main/res/layout/locotes_main.xml
	Locotes/src/main/res/menu/main_locotes.xml
	Locotes/src/main/res/values/styles.xml
	LocotesProject.iml
	README