weep
ie trouble check
less reset and lesshat add
Merge branch 'master' of https://github.com/margo217/btc

Conflicts:
	.idea/workspace.xml
	css/style.css
	js/js.js
	less/style.less