First Check in
Second Check in
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main.js
Third Check in