side bar done
side bar done
Merge branch 'ardroz'