chart rendering is gonna maybe happen now? we have the data for it
Merge branches 'master' and 'master' of https://github.com/cs147win2014/project

# By mnburkle
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  editing the syllabus!!! :D!

# By mnburkle
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  editing the syllabus!!! :D!