Added Alex's build file
Merge conflict