Full stack Lotus
Merge branch 'master' of https://github.com/karlentwistle/planner