Added jquery and bootstrap
Merge branch 'master' of github.com:dcarrot2/fishackathon
Modified base css,license,and base html
base.css
Merge branch 'master' of github.com:dcarrot2/fishackathon
Merge branch 'master' of github.com:dcarrot2/fishackathon