Merge branch 'master' of https://github.com/sixtyh8/lelab-angular

Conflicts:
	.gitignore
ignore
Merge branch 'master' of https://github.com/sixtyh8/lelab-angular

Conflicts:
	.gitignore