Adds twitter bootstrap
Adds sign in form
deletes unnecessary files
Fixes merge conflicts