Fixed some broken links
fixed merge conflicts
Merge pull request #14 from Tigerryttaren/development

Fixed some broken links