modified:   css/main.css
Merge branch 'master' of https://github.com/zeroonedev/cornersmith

Conflicts:
	css/main.css

	modified:   css/main.css
	modified:   fonts/LANE_A.TTF
	modified:   fonts/LANE_A.eot
	modified:   fonts/LANE_A.svg
	modified:   fonts/LANE_A.woff