copying 2048 labbit changes
Merge branch 'master' of https://github.com/jambnation/jambnation.github.io

Conflicts:
	README.md
added .gitignore