Basic editing/testing to index.html
Merge branch 'master' into myWork
Merge branch 'master' into myWork

Conflicts:
	views/index.html

Fixed merge conflict in index.html
Linked jQuery to index.html and started messing with it
Merge branch 'myWork'

Conflicts:
	views/style.css

Merged style.css