side navigation put to work
removed merge conflicts with css
Merge remote-tracking branch 'upstream/master'
side navigation improved
Merge pull request #119 from sunnyLA4/master

mech coord remaining -- all details are final now
removed conflicts on event description
Merge pull request #120 from rishy/master

side navigation edited
hover effect added on side menu
Merge pull request #122 from rishy/master

hover effect added on side menu
resolve events coflicts