Deleted conflicting project file
Merge branch 'alex'
Merge branch 'alex'
Some random changes