Merge pull request #1 from bourneagain/master

test commit bourne
added test sidebar
tried to add modal but rebase issue came up
merge upstream