Issue #274 updating the wishlist button
Resolving conflict
Improving the sign up, forgot your password layout
Applying Code Conventions
Merge pull request #326 from DevYah/finalGui

code verified
Merge pull request #288 from DevYah/T1_andrew_1.8

Issue #274 updating the wishlist button
Fixing conflict