Tough decision but I'm starting from scratch but I will have everything finished by Thursday
Merge branch 'gh-pages' of github.com:SloanHawthorne/ASD-Projects

Conflicts:
	ASD-Projects/ASD Project-1/css/styles.css
	ASD-Projects/ASD Project-1/css/themes/images/icons-18-black.png
	ASD-Projects/ASD Project-1/css/themes/images/icons-18-white.png
	ASD-Projects/ASD Project-1/css/themes/images/icons-36-black.png
	ASD-Projects/ASD Project-1/css/themes/images/icons-36-white.png
	ASD-Projects/ASD Project-1/index.html
	ASD-Projects/ASD Project-1/js/main.js