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

# By mnburkle
# Via mnburkle
* 'master' of https://github.com/cs147win2014/project:
  fixing view assignments, trying to get the stuff to hide :\

Conflicts:
	public/js/viewAssignments.js