Merge pull request #33 from CarrieRider/Dev

Dev
Merge pull request #36 from TatyaniaM/Dev

Dev
Merge pull request #35 from amandagroccia/dev

Merged from Amanda's repo
Merge pull request #38 from TatyaniaM/Dev

Dev
Merge pull request #37 from amandagroccia/dev

Dev
Merge pull request #38 from TatyaniaM/Dev

Dev
Merge branch 'Dev' of github.com:TatyaniaM/SUNYSDE2014 into Dev
Merge pull request #40 from CarrieRider/Dev

Merge pull request #38 from TatyaniaM/Dev
Merge pull request #44 from KellyBlack/Dev

Dev