cleaning up merges
fixing merge
Merge branch 'master' of github.com:smspezzano/d2jive
deleted extra routes file