Still trying to figure this all out This message if from my desktop.
Nothing adding the /js and the /img folders
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/style.css