Renamed two files to prepare them for queries
Merge branch 'master' of git://github.com/larlar/Iterativt-webprosjekt--PJ2100-12-

 Dafuq