dyn fontend
Merge branch 'master' of https://github.com/kaitlin/GoT
k changes
Merge branch 'master' of https://github.com/kaitlin/GoT
sdf
sdf
Merge branch 'master' of https://github.com/kaitlin/GoT

Conflicts:
	index.html