Initial commit
Merge branch 'master' into register
merge new .gitignore
Conflicts:
	.gitignore
merge gitignore from master
added styles in register.html