Fixed naming conventions, added methods to wrap private attributes,
developed gameplay methods more.
Merge branch 'working'