sure... try this
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
My God, JS... format dates like normal languages.
Cleanup
Check-in to master before merge
removing .idea fuckers
changed gitignore
some shit
OMG WHAT THE FUCK
Merge branch 'gh-pages'
removing bullshit
Merge remote-tracking branch 'origin/master'
GET THE FUCK OUT OF HERE
Merge remote-tracking branch 'origin/master'