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 #43 from amandagroccia/dev

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

Merge pull request #38 from TatyaniaM/Dev
Added a make file for the simulations.
Merge pull request #46 from amandagroccia/dev

Dev
Merge pull request #44 from KellyBlack/Dev

Dev
Merge pull request #45 from CarrieRider/Dev

Dev
added code to read the raw data
Merge branch 'Dev' of github.com:CarrieRider/SUNYSDE2014 into CarrieRider-Dev
Merge branch 'CarrieRider-Dev' into Dev
Merge branch 'Dev' of github.com:KellyBlack/SUNYSDE2014 into Dev
Merge branch 'Dev' of github.com:TatyaniaM/SUNYSDE2014 into Dev
Added a python file to convert a data file to csv format
Merge pull request #42 from KellyBlack/Dev

Dev