blank slate, marquee
Merge branch 'master' of github.com:kashwitna/kashwitna.github.com

Conflicts:
	_layouts/default.html