testing
First draft of app
Merge branch 'master' of https://github.com/mhommer/EDGE-Demo

Conflicts:
	index.html