Initial commit
Merge branch 'master' of https://github.com/tiveor/rails4

Conflicts:
	.gitignore