My Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Version 2/App/views/css/style.css