Merge remote-tracking branch 'lou/master'
Merge remote-tracking branch 'lou/master'
Merge remote-tracking branch 'lou/master'

Conflicts:
	ModelClasses/src/edu/ycp/cs320/awesomepage/shared/Status.java
	ModelClasses/src/edu/ycp/cs320/awesomepage/shared/Wall.java
Merge remote-tracking branch 'mcorso/master'
userInfo ID add to userInfo class