Bootstrap on canvas
Merge branch 'master' of https://github.com/LilliJane/Illinda

Conflicts:
	Khaleesi/index.html