pulling from repo
Merge branch 'master' of github.com:jonfu86/Vape
updated with registration page