check schema into vc system
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail

Conflicts:
	db/development.sqlite3
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail
Merge branch 'master' of https://github.com/nixsticks/HappyFuntimeTrail
create add_media action/assosciated view for trails where user can add text to each pin of their trail. Currently no view is rendered when text is submitted