Initial commit
Merge branch 'master' of https://github.com/Parranoia/Rails_Test

Conflicts:
	.gitignore