basic class
what
Fixed merge issues with folders getting deleted
stuff
Merge branch 'parser' of https://github.com/yarko3/assignment2 into feature-sentenceConst

Conflicts:
	drunkbot/bin/main.class
	drunkbot/src/main.java
Merge branch 'parser' of https://github.com/yarko3/assignment2 into feature-sentenceConst
nnn
Merge branch 'master' of https://github.com/yarko3/assignment2 into feature-sentenceConst

Conflicts:
	drunkbot/bin/inputParser.class
	drunkbot/bin/main.class
	drunkbot/src/main.java
Proper, basic conversation and added a few lines to the dictionary
Merge branch 'feature-sentenceConst'

Conflicts:
	drunkbot/dictionary.txt