delete editor
fake merge
add ignore
change ignore
update 15.04.2014
fake merge
work on ignore
Merge branch 'gui' of https://github.com/Mr-Moe/hotel into gui
clean some folder