Merge pull request #35 from TatyaniaM/Dev

Dev
working on code...minor change
Merge branch 'dev' of github.com:amandagroccia/SUNYSDE2014 into Dev