change to 2048
add code for 2048
Merge remote-tracking branch 'origin/master'

Conflicts:
	stylesheets/stylesheet.css