Updated with phase2 and research
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
Sidan kunde inte laddas pga små skit som vanligt
Merge pull request #118 from EdinSkeja/gh-pages

Changed..