ripped out the rest of the old crap, added nav bar functionality
ripping stuff out
Merge branch 'master' of github.com:encorelab/ck-brainstorm