commit first push of code
Apr 22 restart of GIT

Deleted repository and attempting to add a new one by same name
Merge branch 'master' of https://github.com/jerzuk/omrails

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