waiting for function to determine what type of user is logging in
resolved merge issue
Merge branch 'gh-pages' of https://github.com/BadAssGUIGroup/FlyingDutchman into gh-pages

Conflicts:
	js/main.js
fixed local merge issue, quickly set up code to load employee or customer page depending on who logs in.  Still broken due to Jonas' code