Initial commit
Merge branch 'master' of https://github.com/danaki/rails-rest-test

Conflicts:
	.gitignore