a

aa
Merge branch 'gh-pages' of https://github.com/al1271/DWS into gh-pages

Conflicts:
	Garza_Alexander_Project_2/Images/Ipad.jpg
	Garza_Alexander_Project_2/Images/Iphone.png
	Garza_Alexander_Project_2/Images/Ipod.png
	Garza_Alexander_Project_2/Images/Macbook.jpg
	Garza_Alexander_Project_2/css/styles.css