made user model
fix merge conflicts
add login and signup buttons on home page that will append signup and login forms
create user page
fix merge conflicts
delete signup and login partials
fix merge conflicts
Merge branch 'master' of https://github.com/cicadas-2014/Embark
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
ahh!"
Merge branch 'master' of https://github.com/cicadas-2014/Embark into jason
Merge pull request #82 from DineshRai/create_user_model

Create user model
fixed merge conflictis
Merge pull request #88 from LasseSviland/master

renamed del to admin, updated routes
schema