modified:   static/js/code.js
	modified:   static/style/inner.css
Merge branch 'master' of https://github.com/Kolbaskin/tend