css changes
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #84 from LasseSviland/master

finised setting up new database
top absolute tagline div
Pushed awesome image gallery
Merge branch 'master' of https://github.com/cicadas-2014/Embark
remove extraneous stuff
Merge pull request #85 from JessicaTatham/master

Pushed awesome image gallery
fixed merge conflict
fixed merge conflicts
Merge pull request #86 from jasonMatney/jason

some merge and css conflicts fixed
Merge branch 'master' of https://github.com/cicadas-2014/Embark
WIP CSS of second page
Deleted unneeded code and kept basic design to refactor
Merge pull request #87 from JessicaTatham/master

Fixed unneeded code and kept basic design
renamed del to admin, updated routes