theme changes
Merge pull request #5 from ardevw/templateChanges

theme changes
Merge origin/master into added_plugin

Conflicts:
	wp-content/themes/trim/trim.css
	wp-content/themes/trim/trim.css.map