added categories views
added welcome stuff
added bootstrap
added users stuff
finised up users
last changes before heroku push
branch merge