Merge pull request #11 from Tigerryttaren/development

fixed some links and merged
stuff
fixed broken css and js links