initial commit
Merge branch 'master' of github.com:pythdasch/revolution

Conflicts:
	.gitignore