Merge pull request #61 from s-loar/Lienha

routes incomplete
nothing much
took of comment on this resource, and made users signin to post comments
Merge pull request #62 from s-loar/JennieO23

took of comment on this resource, and made users signin to post comments
video size changed
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into steve_mon
Merge pull request #63 from s-loar/steve_mon

Video height changed
marker stuff
css merge conflicts fixed
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into Lienha

Conflicts:
	log/development.log