-Added My Account functionality
-Fixed merge conflict