not sure what this one is
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development
index stuff
stuff
adding to index view
meh
Merge branch 'development' of https://github.com/franjohn21/doger_much_wow into development
commit to pull
fixing merge conflict