Try this
Update config
Update config
Update config again
Add some files that werent there
add gitignore
Merge branch 'master' of github.com:TouchtechLtd/posboss-web

Conflicts:
	.gitignore