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
Issues #167 #168 modifiying the controller test
Issues #167 #168 adding documentation to the views
Merge branch 'master' into T5_jihan_adding_disease_modified
Issues #167 #168 fixing the controller test