KM - Initial Commit with the rails stuff
KM - Fixed merge conflict
	- .gitignore