Merge pull request #5 from feathj/tyler

Tyler
keeping things consistent
Merge pull request #6 from feathj/tyler

Tyler
Merge pull request #8 from feathj/tyler

Tyler
Merge pull request #10 from feathj/tyler

Tyler
Merge pull request #12 from feathj/tyler

Adding teacher pages and functionality
Merge pull request #14 from feathj/tyler

Create/Edit Student Info
Merge pull request #16 from feathj/tyler

Some cleaning up as well as adding functionality for adding teachers and...
Merge pull request #18 from feathj/tyler

Can now update teacher without having to reassign students, and added cl...
Merge pull request #20 from feathj/tyler

Styled up
Merge branch 'tyler'

Conflicts:
	login.php
Merge pull request #24 from feathj/tyler

Fixed labels on radio and checkbox inputs and styled submit buttons
Merge pull request #26 from feathj/tyler

Assignments!
Merge branch 'master' into tyler

Conflicts:
	bower.json