got log in, session, and sign up working
Resolve merge conflicts
Fix @user issue in '/' route
Merge pull request #11 from banana-slugs-2014/tim

got log in, session, and sign up working