encaptulation fixes
Merge branch 'master' of https://github.com/howardboland/knock2win

Conflicts:
	app/scripts/controllers/main.js
Merge branch 'master' of https://github.com/howardboland/knock2win