landing + register
Merge branch 'master' of https://github.com/justinpost/gnsk_app

Conflicts:
	js/functions.js
	landing.html