some styling
Merge branch 'master' of https://github.com/nairys/bookstorm

Conflicts:
	app/assets/stylesheets/header.css
	app/views/sessions/new.html.erb

all done
trying to sort conflicts
;
some styling
Merge pull request #16 from nairys/raza_day_3

Raza day 3