initial commit
add Gemfile.lock
add layout and assets
create basic route
add Procfile to deploy to Heroku
Merge branch 'master' of github.com:kshuin/Olie

Conflicts:
	.gitignore