added header
organising base framework
stuff
merged
fixed merge
deleted file
Merge pull request #8 from dianahervascastillo/development

Development
minor tweaks
0.0.6
Merge pull request #9 from adjohnston/development

0.0.6