begining interface
Merge branch 'master' of https://github.com/sticknor/CMTechnologyApp

Conflicts:
	static/index.html