changing
Merge branch 'master' of https://github.com/Sirenity/2048

Conflicts:
	js/ai.js