Merge pull request #4 from gvn/wip

Wip
fake data in /json
rename
component stuff
added tile container
popcorn tile
remove capitalize
temp hight
font-awesome
hyphoen
button
 button file
hackable tile basics; fixing indentation on resets
added file
Merge branch 'master' of https://github.com/gvn/webmaker-profile into wip

Conflicts:
	_fe/js/main.js
	_fe/less/main.less
Merge branch 'master' of https://github.com/gvn/webmaker-profile into wip
added masonry
comma
adding hackable tile
Merge branch 'master' of https://github.com/gvn/webmaker-profile into wip

Conflicts:
	_fe/js/tiles.js