Removed a clear page etc
Solved conflict fuck
Merge branch 'master' of https://github.com/niive12/interflex