sprint release
Merge branch 'master' of https://github.com/crzndx/AMOS-SS14-Group-3.git