Final stuff
Merge branch 'master' of github.com:AaronMorais/scribbly