Merge branch 'landing' of https://github.com/michaelmunson1/caracol
Merge pull request #66 from michaelmunson1/landing

Landing Page
Merge branch 'master' of https://github.com/michaelmunson1/caracol
working on auth
some work on auth routes, also added footer and privacy policy / terms of service
Merge pull request #67 from michaelmunson1/ianAuth

some work on angular side of authentication, also added footer
fixed router so that user can see landing page when not signed in
Merge pull request #68 from michaelmunson1/ianAuth

fixed router so that user can see landing page when not signed in
added MIT license
added contact info
fixed merge conflict that corrupted last copy
Merge branch 'master' of https://github.com/michaelmunson1/caracol
tweaked some landing css
Merge pull request #69 from michaelmunson1/ianAuth

tweaked some landing css
bookmarklet grey, buttons orange, snail present
more styling; media query working
style bkmlt;  add media query for mobile; begin to implement delayed removal function
change media query width to 200px
add caracol.cloudapp to script
Merge pull request #70 from michaelmunson1/styleBookmarklet

Style bookmarklet