merging branches
Merge branch 'master' of https://github.com/nikhil9/QGC