updated gitignore
Changed path of words.txt
changes
Merge branch 'mscndle'

Conflicts:
	src/Gameplay.java
merging mscndle
deleting .class files
fixing merge
view class