Removes console.log from deleteCards
Fixes issues with doorServer but correcting parsing code, Adds memberAdd
add employee time clock server
Adds timesheet code
Moves controllers, services and factories into respective folders
moves paths of includes to relative to root
Adds employee partials
adds merchant to route
Adds index to delete
adds grunt and grunt contribs
Fixes merge errors
Fixes merge errors between head and local