reverted useless changes and back to normal
Merge branch 'gsoc' of https://github.com/kaichogami/sunpy into gsoc

fixing "tip of the branch behind the remote counterpart error"