Added simple layout
Merge branch 'master' of https://github.com/ftrimble/KingMe-web

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.erb