Updating main repo
Merge branch 'master' of https://github.com/glouma01/IS-2014