Fixed some bugs, updated MainActivity and LoginActivity
Merge branch 'master' of https://github.com/TeamStingers/StudentOrgManager
Merging some stuff
Conflicts:
	src/com/seniordesign/studentorgmanager/MainActivity.java