delete all bootstrap files and code
took out bootstrap code from login form
fixed merge conflict