updated two files, messed up yer stuff
something changed, no idea what
Merge branch 'master' of https://github.com/djdaniels90/somethingToMessUp

* 'master' of https://github.com/djdaniels90/somethingToMessUp:
  testing merge