init commit
Merge branch 'master' of https://github.com/mightygraf/tp_2013_10_web_kildishev