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

# By Isabelle Woodrow (1) and mnburkle (1)
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  your current grade on multiple tabs
  overall grade in assignments tab