Setup maven properly because im retarded
Merge remote-tracking branch 'origin/master'