in progress
merged conflict
got side menu working
Merge pull request #6 from guarani/issue#3

Issue#3