Add media model
Merge pull request #2 from SalamanderMike/master

Merge map changes with new repo
add trip model
Merge branch 'master' of github.com:TeamGlorious/explorify

Merge conflict resolved
Trip migration adjustments
Add trip routes and controller
Merge pull request #3 from MooreJesseB/master

User login logout auth flow built and working.
Merge branch 'master' of git://github.com/TeamGlorious/explorify into dev
Merge Jesse
Add map skin