added code for uploading images on a /upload page and added a ini parser for parsing amp.ini
testing upload
added mysql upload and display for photos page
updated for coding standards during code review
added pdo options to display exceptions instead of erros
Merge branch 'upload_and_config' into new_features

Conflicts:
	web/css/style.css
	web/index.php
	web/js/post-note.js
added config class and phpunit tests for it
fixed some problems caused by my careless merge
removed gallery functionality because photos table does not exist for this sprint
Merge branch 'integration' into new_features

Conflicts:
	composer.lock
	web/css/style.css
	web/index.php
pulling chris' form builder into my new_features branch
Made meet the band update page and put a form that doesn't do anything on it.
changed some options for the form fields
Added forms for adding new members and meet the band pages now pulls data from mysql
Merge branch 'rawilder' into integration

Conflicts:
	composer.lock
updated composer.lock and fixed phpcs errors
Merge branch 'integration' of https://github.com/agilemusicproject/agilemusicproject.com into integration
started work on abstracting out template tests
added swiftermail options
Merge branch 'integration' of https://github.com/agilemusicproject/agilemusicproject.com into chrisdlangham