Basic framework set up

Twitter Bootstrap and basic HTML file including all JS libs done.
Rectified conflict
Fixing merge issues
Fixed all commit issues. Now on branch master
Interface changes completed

Awaiting final tweaks. UI should be done after that,