Initial commit
basic framework
basic framework with container
Added File and coding conventions for the project
Merge pull request #2 from CrouseMatthew/Matthew

Matthew
Project Starting Point: created img,css,js folders; added template home.html
added Jscript folder and a dummy file
Merge pull request #3 from CrouseMatthew/Matthew

Matthew
commit before pull
Merge branch 'master' of https://github.com/CrouseMatthew/Group-Project
fixed index page
fixed index page
Merge branch 'master' of https://github.com/CrouseMatthew/Group-Project into gh-pages

Conflicts:
	mattHome.html
broken
Fixed Html