New Files
Merge branch 'master' of https://github.com/nuxbox/NorthBay

Conflicts:
	.gitignore