Merge branch 'master' of https://github.com/fablenas/avengers

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/fablenas/avengers