merge fix
Merge branch 'master' of https://github.com/nickzarzosa/ideasofmarch2014team6