Session fixed
minor
Merge branch 'KM_Sass' of https://github.com/eugene195/tp_2014_09_java into Gameplay_Refactor
minor1
Merge branch 'Gameplay_Refactor' of https://github.com/eugene195/tp_2014_09_java into KM_Sass