Basic start
Merge branch 'master' of github.com:Enouk/frisbee