initial git push
Merge https://github.com/jordanharris/Magellan