Initial commit
Merge branch 'master' of github.com:VisualAppeal/erp

Conflicts:
	.gitignore