init
I apparently can't watch funny movies and git at the same time.
Fixed the merge issue