php files added need tweaking
Merge branch 'master' of github.com:kylegriffiths19/secret-santa

Conflicts:
	_assets/js/main.js