Merge branch 'master' of https://github.com/chicagocamps/camp-workshops

Conflicts:
2014/axure/index.html
index.html
update structure
Merge branch 'master' of https://github.com/chicagocamps/camp-workshops

Conflicts:
	2014/axure/index.html
	index.html
clearing master
restoring master from gh-pages
Updating image, css & structure
Merge pull request #3 from chicagocamps/master

synch live with updated master