Fixed merge in hidden.html
Fixing merge conflinct in hidden.html
Trying to fix merge again, arg...
Removed stupid merge conflicting file
Adding a bunch of things from merge conflict issues... hope... pray
Trying to add shit... getting desparate here
Ok, commiting shit again for the 6 time