Changed a lot of things on the front-end. Mostly in welcome and departments.
Merge branch 'master' of https://github.com/wanmen/Schrodingers-Cat

Conflicts:
	README
	app/views/departments/index.html.erb
	app/views/departments/show.html.erb
	log/development.log
	tmp/pids/server.pid
Added files.
deleted server.pid