Merge branch 'master' into touch_carousel
Favicon and better text
Major resizing images, adding Makefile and a few functions. Also setting ad to index.html
Merge branch 'touch_carousel'