Fixed referencing issues with css and .js

Changed location of bootstrap and js. (though bootstrap is not used, can
be removed)
Merge branch 'master' of https://github.com/yaoxiangg/PinnerSpace

Conflicts:
	www/index.html