commiting before pull
Merge branch 'dev' of https://github.com/mcalabio/Super-Wizard-Potion into dev

Conflicts:
	records/records.json
level progression adjustments technique