bootstrapping
bootstrap and email field to student
fixing merge error
merge error fix
Merge pull request #11 from slwaller/master

bootstrapping and email field