Finished_user_story_testing #217
Finished_user_story_achievement_waiting_for_devise_to_be_merged #217