initial commit
new files
made some changes
Merge branch 'asonix' into sidebar
don't know what color we should make the sidebar