faux commit
Fixed conflict
Made the jquery selector more specific'
Updated design phases page