wip
to merge
added bootstrap
Merge branch 'views'
Merge changes from controller