moved files
Merge branch 'master' of https://github.com/irxess/Fellesprosjekt-Gruppe-5-2014