Merge pull request #5 from tsabend/master

Ready for styling.
fonts
Merge pull request #6 from znagler/master

fonts
in case
Merge branch 'master' of https://github.com/unknownbreaker/bachelor.ette

Conflicts:
	app/views/layout.erb
	public/css/application.css