Merge branch 'master' of https://github.com/kurtzy317/GasTracker

Conflicts:
	AndroidManifest.xml
	bin/GasTracker.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/mindalsoblown/gastracker/AddEntry.class
	bin/classes/com/mindalsoblown/gastracker/DatabaseConnector.class
	bin/classes/com/mindalsoblown/gastracker/History.class
	bin/classes/com/mindalsoblown/gastracker/Login.class
	bin/classes/com/mindalsoblown/gastracker/R$id.class
	bin/classes/com/mindalsoblown/gastracker/R$integer.class
	bin/classes/com/mindalsoblown/gastracker/R$layout.class
	bin/classes/com/mindalsoblown/gastracker/R$menu.class
	bin/classes/com/mindalsoblown/gastracker/R$string.class
	bin/classes/com/mindalsoblown/gastracker/R$style.class
	bin/classes/com/mindalsoblown/gastracker/R$styleable.class
	bin/classes/com/mindalsoblown/gastracker/Register.class
	bin/classes/com/mindalsoblown/gastracker/Stats.class
	bin/resources.ap_
	gen/com/mindalsoblown/gastracker/R.java
	project.properties
	res/layout/activity_add_entry.xml
	res/layout/activity_fill_up_detail.xml
	res/layout/activity_stats.xml
	res/values-v21/styles.xml
	src/com/mindalsoblown/gastracker/Stats.java
Merge branch 'master' of https://github.com/kurtzy317/GasTracker

Conflicts:
	bin/GasTracker.apk
	bin/R.txt
	bin/classes.dex
	bin/classes/com/mindalsoblown/gastracker/R$id.class
	bin/resources.ap_
	gen/com/mindalsoblown/gastracker/R.java
	res/layout/activity_fill_up_detail.xml