inital commit
Merge branch 'master' of https://github.com/kilroy91841/HomerRails

Conflicts:
	.gitignore