changed css, updated users_controller, created and edited new user and preferences views, updated routes accordingly, edited newuser feature to work in cucumber, edited paths.rb to reference things correctly
merged the github into master