new js + bootstrap
Rearranged some project files
added bootstrap to the project
Merge remote-tracking branch 'origin/master'