Updaing to prevent merge
Merge branch 'master' of github.com:code-curve/Under

Conflicts:
	js/dictionary.js
Created tile class and defined first tiles