added prelim styling
xMerge branch 'master' of https://github.com/PandRaid/OLM

Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/javascripts/application.js
	app/views/layouts/application.html.erb
	config/initializers/secret_token.rb
	config/routes.rb