before merge, commit first
Merge commit '61a3b30be02cb5bf679cb489b51adad1499825e9'

* commit '61a3b30be02cb5bf679cb489b51adad1499825e9':
  Add teams
  Edit instructors
  Edit sponsors and fix routing issues
  Edit students and render error messages
  Fix for sponsors

Conflicts:
	app/views/layouts/application.html.haml
	app/views/sponsors/index.html.haml
fix the font problem
some minor changes
Merge remote-tracking branch 'zhen/master'