added plugin
added plugin
added plugin
Merge origin/master into added_plugin

Conflicts:
	wp-content/themes/trim/trim.css
	wp-content/themes/trim/trim.css.map
Merge pull request #4 from ardevw/added_plugin

added plugin