Added new feature
Added second new feature
Merge remote-tracking branch 'origin/master' into new-feature

Conflicts:
	index.html
Merge branch 'master' into new-feature
Title Change
Merge branch 'master' into new-feature

Conflicts:
	index.html
Change made in branch
Merged new feature into master