something
Did terms of use
All the shit i did today
I dont know
Making students/_form partial, using it for students/new.html and
students/edit.html
Merge branch 'master' into bootstrap

Conflicts:
	app/assets/stylesheets/bootstrap.css.scss
	app/views/students/new.html.erb