jorda made edit
Merge branch 'master' of https://github.com/jtown12/workingwithmike

Conflicts:
	gooddata.html