remove a M_Salon's friend
renamed variableNick into m_variableNick
adding m_ to certain members
condition inversion + some renaming
cleaning prototypes
variable renaming: m_*
Merge pull request #2 from bmorel/master

some basic renaming and styling modifications