Basic functionality added.
Merge branch 'master' of https://github.com/LausDaeus/IS3Team11Project

Conflicts:
	index.html
	js/jquery.js

Also replaced images.