Links and images
Merge branch 'master' of https://github.com/pencilz/csc236-site

Conflicts:
	learn.html
Added new file and updated feedback form.