final spell check
Removed conflict file
Merge pull request #163 from karinlag/2013-07-oslo

2013 07 oslo