added bottom bar
fixed conflict
Merge branch 'master' of github.com:kuoloneous/spderp