Added my project; added back "your solution here".
finish merge