Added skeleton for new workouts and announcements
Merge remote-tracking branch 'Juan/master'

Conflicts:
	TeamManager/src/edu/ycp/cs496/TeamManager/TeamManagerServlet.java
Merge remote-tracking branch 'Juan/master'
Finished backend of FakeDatabase and controllers.
Still need to expose servlets
Merge remote-tracking branch 'dan/master'

Conflicts:
	TeamManager/war/login.js
Fixed problem with .gitignore that prevented 3 controllers from being
version controlled
Added GetEvent to version control
Merge remote-tracking branch 'dan/master'