Update untitled.js
Merge branch 'master' of https://github.com/maskwrestler80/learndev into dev2

Conflicts:
	untitled.js
Merge branch 'dev2' of https://github.com/maskwrestler80/learndev into dev2

Conflicts:
	untitled.js