First shell submit
Some style & other bugs fixed
Style fixed. Simple mode now knows when to stop :)
stupid bugs fixed
Merge pull request #156 from haskile/master

Лиза Игнатьева, гр. 295, Shell