deleted extra copy of files that didnt merge correctly.
continue fixing
Merge branch 'master' of https://github.com/pennja01/NorseSquare
Merge branch 'master' of https://github.com/pennja01/NorseSquare