deleted unneccessary console.log
Merge branch 'master' of github.com:kekskrise/esh-2014
fucking jävla avstånd
Merge branch 'master' of github.com:kekskrise/esh-2014
more changes
more changes
merged everything
more conflicts