Version 1.0
Merge https://github.com/otherman16/tp_2014_09_projectname