Merge branch 'master' of C:\wamp\www\github\AuthorIT with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	wordpress/wp-content/themes/authorit/css/style.less
fuck that