new commit 2
new commit 3
Merge origin/master

Conflicts:
	styles.css