merge?
Merge branch 'master' of https://github.com/ajcummins/CS496Project.git

Conflicts:
	CS496_Project_Mobileapp/src/edu/ycp/cs/cs496/project/mobileapp/LoginActivity.java