What to do... what to do?
Merge branch 'master' of https://github.com/BartWaardenburg/wishy

* 'master' of https://github.com/BartWaardenburg/wishy:
  What to do... what to do?

Conflicts:
	web.js
Re-init
Merge branch 'master' into develop

* master:
  Re-init
  What to do... what to do?