ahh!"
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
schema
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
schema
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
worked on second page
css
js auth
Merge pull request #95 from LasseSviland/master

removed default value for map url
changed nil value from map url
url
Merge pull request #96 from jasonMatney/jason

css
added video
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #97 from jasonMatney/jason

added video
updated home html
fixed merge conflict