javascript
Merge branch 'master' of https://github.com/Eythorio/random-experience

Conflicts:
	pages/prize-user.php