serepate mid and final
Merge branch 'dev' of https://github.com/theballkyo/GetA into dev