rails app
init app
asset compile
more init code
Merge branch 'master' of https://github.com/nin301/nin301.github.io

Conflicts:
	legos_3.html
	legos_4.html