asdf
Commented out code
asdfasdfasdf
Merge branch 'master' of https://github.com/chungs1/ItsBeenAWhile.git

Conflicts:
	ItsBeenAWhile/res/values/strings.xml
sdaf