merge conflix?
Merge branch 'master' of https://github.com/eysalee/Bayou
cleaning up wahahahaha..