live-dance-paint megazine
Hiding analytics on the dev branch
pdo.php
Removed pdo.php file
Installing wordpress in news directory
Merge branch '20140724-wordpress' into dev
removed wordpress from dev
REmoved wordpress to re-install
Re-install wordpress files
Merge branch '20140724-wordpress' into dev

Conflicts:
	news/wp-config.php
Trying wordpress install again
Merge branch '20140723-newRSSfeedoption' into dev

Conflicts:
	research/scholcomm/scholarworks/forms/sw_onlineagreementform.pdf
	sitemap/index.php
Check extensions file
Updated extensions
trying again
Deleted extensions.php
Added suma files to dev
Merge branch 'dev' of https://github.com/ssu-library/library.working.dev into dev
news

Library News Blog
Merge branch 'newsblog' into dev