Villawns first commit
Merge
Merge remote-tracking branch 'villawns/master'

Conflicts:
	funny/wp-content/themes/minyawns/src/plugins/jquery.calendar.js
	test/wp-content/themes/minyawns/src/plugins/jquery.calendar.js
	wp-content/themes/minyawns/src/plugins/jquery.calendar.js
Merge remote-tracking branch 'villawns/master'
Merge remote-tracking branch 'villawns/master'
Merge remote-tracking branch 'villawns/master'
Local Host first commit