initial commit base rails app
Merge branch 'master' of github.com:andrewjwolf/railsfun

Conflicts:
	.gitignore