add login
add code template
Merge origin/master

Conflicts:
	.gitignore