aborting is bad mmk
Merge branch 'development' of github.com:corbinsykes/jammin into development