Resolved conflicts that happened when I did a pull of the v4.0a -
Register-three-branches and doing a commit.
fix issue with StylesAdictions.css and re-commit
Fixed issues iwth you-stay.html and recommit
fix issues with register page and commit
committing all with resolved issues to be able to pull
Merge branch 'v4.0a---Register-three-branches' of github.com:CANHEIT/CANHEIT-2013 into v4.0a---Register-three-branches