initial adding
pushing scripts
new edits, added canvas border
added line
committing changes so i can switch branches
added folder for interface design website
fixing merge conflicts
Kinetic Sculpture Project complete
Merge branch 'Alex'
removed old html page for the kinetic sculpture assignment
Renamed testing html page, and removed old html page that wasnt using mobile. Should be final commit for the assignment
Merge branch 'Alex'
adding home page for interface design site, currently working on the page layout
worked on the UI for interface design website, navigation was taken from the JSWebsite design
added Help page and link to it on all pages, need to handle the nav bar making too big of buttons causing a double row nav bar.
updates
Merge branch 'michael'

Conflicts:
	KineticSculptProject/test.html
Merge branch 'Smitty'