final commit on presentation day
Merge pull request #9 from klaoha06/daniel_final_edits

final commit on presentation day