quick sync
Merge branch 'master' of https://github.com/HDXconnor/Risque

Conflicts:
	.gitignore
Merge branch 'master' of https://github.com/HDXconnor/Risque

Conflicts:
	.gitignore