Dependencies
Merge
Merge branch 'master' of github.com:turion/hacknotts14
Fixes imports