tutorial2
Merge branch 'master' of https://github.com/exabugs/rails4-template

Conflicts:
	sample.txt