change hero img
favicon img
margin change 480 media query
Merge branch 'gh-pages'

Conflicts:
	index.html
	main.css
Merge branch 'gh-pages'

Conflicts:
	main.css
altered img width
added script tag in html for old phones
header change
Merge branch 'gh-pages'

Conflicts:
	main.css
added hamburger menu image
dropDown menu to show on click
drop down menu
menubar p size
icon size change
Merge branch 'gh-pages'

Conflicts:
	app.js
	images/hamburger_icon.png
	index.html
complete with nonfullscreen video
Merge branch 'master' into gh-pages