Added a license so Jimbo can sleep at night
Merge branch 'development'