ip checking now uses common functions
Merge branch 'master' of github.com:johns996/NMU-Responsive-Omega
Merge pull request #31 from johns996/dev-eric

Merge pull request #30 from johns996/master
Merge pull request #32 from johns996/master

Fix login and user pages