Reverted changes.
Removed merge problem files.
Merge branch 'master' of https://github.com/Onaga/Webpage-beta
Remove buggy merged files.