Created customer page
Merge branch 'master' of https://github.com/cal5barton/cbjfmw

Conflicts:
	cbjfmw.v11.suo

Merging files
Added Settings page
Merge branch 'master' of https://github.com/cal5barton/cbjfmw

Conflicts:
	cbjfmw.v11.suo

Merged stuff