Added some stuff to master
Added some stuff to make masters commit history a little longer
made the master branch have a longer history
why is the wrong branch getting these commits?
wtf is going on lol
Resolved some merge conflicts. This must be done manually.