Second pages commit
	modified:   2048_files/application.js
	modified:   2048_files/game_manager.js
	modified:   2048_files/grid.js
	modified:   2048_files/keyboard_input_manager.js
	modified:   2048_files/local_score_manager.js
	modified:   2048_files/main.css
	modified:   2048_files/tile.js
        new file:   "2048_files/\320\272\320\276\320\277\320\270\321\217 main.css"
        modified:   index.html
Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	2048_files/application.js
	2048_files/game_manager.js
	2048_files/grid.js
	2048_files/keyboard_input_manager.js
	2048_files/local_score_manager.js
	2048_files/main.css
	2048_files/tile.js
	index.html