made a lot of changes
Merge branch 'experiments' of https://github.com/lpommers/Pixie-Book-KEA-Group into experiments

Conflicts:
	pixie.html
	style.css
made changes