Deleted unnecessary code. -SF
Merge branch 'master' of https://github.com/casal033/UMM3601ursamajor
Changed format. Deleted an unnecessary div. -SF
Deleted unnecessary code based on Joseph's assessment. -SF
Fixed typo. -SF
Merge remote-tracking branch 'origin/master'
...
Merge remote-tracking branch 'origin/master'

Conflicts:
	client/app/main/main.css
	client/app/main/main.html
simplified code -SF