new site
Merge branch 'master' of https://github.com/jcavar/jcavar.github.io

Conflicts:
	androidworkshop/_posts/2014-05-23-class3.markdown
	androidworkshop/_posts/2014-05-23-class4.markdown