Added William Johnson's gradle file
Merge origin/master