Did stuff to the home page in trying to add parallax
Merge remote-tracking branch 'remotes/origin/parallaxHome'
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/parallax.css
	home.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	css/main.css
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Fixed navbar
Merge remote-tracking branch 'origin/master'

Conflicts:
	home.html