Changed login box from iframe to html
Merging new stuff
Resolved conflicts
and again...
This isn't working so well...
And this, kids, is why we branch.
ARG!
hmmm...
Merge branch 'master' of https://github.com/jacobwwalker/caerus-web