nothing much
Merge pull request #63 from s-loar/steve_mon

Video height changed
marker stuff
css merge conflicts fixed
more styling
Pulled latest changes
added short & long description columns to tours, updated seeds
Merge branch 'master' of https://github.com/s-loar/Divvy_Up into Lienha

Conflicts:
	log/development.log
Merge pull request #66 from s-loar/Lienha

Lienhaadded short & long description columns to tours, updated seeds
added short & long description columns to tours, updated seeds
Merge pull request #68 from s-loar/Lienha

added short & long description columns to tours, updated seeds
recommendation model and migration
pulled