minor changes
Merge branch 'develop' of https://github.com/crzndx/AMOS-SS14-Group-3.git