finsh up student modal and added base2 for account page
fix conflict
fixed conflict, changed to bootstrap.css
Merge pull request #15 from amulius/student_frontend_jeff

Student frontend jeff