added menu bar
added menu bar
working on one page scroll
fixing merging conflicts
added menu bar
added menu bar
working on one page scroll
ui changes
fixed conflicts
Merge pull request #20 from power9/master

ui changes
Merge pull request #21 from SceneIt/staging

Staging