initial adding
pushing scripts
new edits, added canvas border
added line
committing changes so i can switch branches
fixing merge conflicts
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
updates
Merge branch 'michael'

Conflicts:
	KineticSculptProject/test.html