workspace changes
Merge branch 'master' of https://github.com/katekinsman/JAK

Conflicts:
	bootstrap-3.1.1-dist/bootstrap-3.1.1-dist