Merge pull request #2 from salte2ba/master

Added Title
Template/jquery/bootstrap
lots of stuff.. need to fix scrollspy
 Merge commit
Removed git autogenerated conflict markers