Initial
Updated gitignore
Merge branch 'master' of https://github.com/Wachiwi/rails-test

Conflicts:
	.gitignore