Buncha new shit
Merge branch 'dev' of github.com:thedanyaal/Contra into dev