got take a picture working
fixing things
Merge branch 'master' of https://github.com/lpukatch/Phlogging

Conflicts:
	bin/classes/edu/miami/masonandluke/phlogging/MainActivity.class
	bin/classes/edu/miami/masonandluke/phlogging/R$id.class
	bin/classes/edu/miami/masonandluke/phlogging/R$layout.class
	bin/classes/edu/miami/masonandluke/phlogging/R$menu.class
	bin/classes/edu/miami/masonandluke/phlogging/R$string.class
	gen/edu/miami/masonandluke/phlogging/R.java