Initial branch commit
main.rb updated with routes
added gitignore
added gitignore
Merge branch 'master' into controller

Conflicts:
	Gemfile.lock