prof update
Merge branch 'master' of https://github.com/TeamStingers/StudentOrgManager

Conflicts:
	gen/com/seniordesign/studentorgmanager/R.java
	res/values/strings.xml