Done for the night
Did a ton of stuff making a User model
oh god
Merge branch 'bootstrap-bill'