Initial commit
Merge branch 'master' of github.com:studotwho/railstest

Conflicts:
	.gitignore