Progress update
Merge branch 'Refactor' of https://github.com/disconsented/ANSSRPG into Refactor

Conflicts:
	.travis