player2
Merge branch 'master' of ssh://91.121.113.133:7299/home/draklaw/ld48
Tweaked boss level.
Merge branch 'master' of ssh://91.121.113.133:7299/home/doc/public_html/LD48/ld48
Added dialogs for chapter 2 and modified the previous ones to fit the map.
Merge /home/draklaw/ld48
flame
Titre
Titre
Quack experimental Chapter 2, WIP.
Hrse
Minor fixes on level 2.
Merge /home/alia/ld48
Updated Chap 2 map.
Fixed map (again, partly).
Chapter 2 still in the works.
Merge branch 'master' of ssh://91.121.113.133:7299/~/public_html/LD48/ld48
WiP chap3.
Merge branch 'master' of ssh://91.121.113.133:7299/home/doc/public_html/LD48/ld48
Merge branch 'gh-pages' of https://github.com/GammaNu/dagfin

Conflicts:
	js/main.js