Updating notes on Ngaged
Merge branch 'master' of https://github.com/menslow/voltron

Conflicts:
	application/index.html