fixed conflicts
Merge branch 'prototype4' of https://github.com/CalvinFernandez/Speechero into prototype4