udpated nav bar based on sessions
pulling vote update
Merge branch 'master' into update_user_sessions
user settings is updated
updated homepage layout
my best commit ever - updated style in all pages, updated sessions, added marketing header, updated nav bar
Merge pull request #22 from fox-squirrels-2013/update_user_sessions

lgtm