re position menu box
worked on login and login detail button
pair programming with David.  Broke everything, and re built.  Back to step one prior to pair programming
miscellaneous attempts at fixing merge
re-attempt at merge
Merge commit 'c18b3d3' into develop
continue work
With David's generous help and Brian and Gerald's diligence, we finally obtained nirvana