initial commit
Merge https://github.com/mturbe/bearded_archer