Adds new files
Merge https://github.com/elitalobo/GSOC2014