some work made not hard-coded
Merge branch 'master' of https://github.com/cs147win2014/project

# By mnburkle
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  more stupid formatting