Merge branch 'master' of C:\xampp\htdocs\com.valtraflair with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	js/master/core.js
	pages/index.html
Adding photo for parallax