// .gitignore file added
// Welcome 2013
Merge branch 'development' (Welcome 2013)