First commit
Merge branch 'master' of github.com:diegomarquez/rater

Conflicts:
	.gitignore