more
Merge branch 'master' of https://github.com/cs147win2014/project

# By mnburkle
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  about us instead of info
  hid annoying hihihi
  added back button and new panel for title course and stuff
  removed navbar stuff, not working