working on css, login, registration
stuff
acceptance tests
resolved conflicts
merged design into master branch