site scaffolding
first commit
Merge branch 'master' of https://github.com/exavior75/Angular

Conflicts:
	ncr_server.py