Added more lines
Merge branch 'master' of https://github.com/foohm71/git-trials

Conflicts:
	public/index.html