wp-config
changes
Merge branch 'master' of https://github.com/upsmart/Project-UpSmart
changes to bbpress.php
Merge branch 'master' of https://github.com/upsmart/Project-UpSmart
Updating wordpress
Updating plugins and adding new themes