removed all comments
Merge remote-tracking branch 'origin/master'
Super crazy stuff!