added code for uploading images on a /upload page and added a ini parser for parsing amp.ini
testing upload
using twig template for forms and security also have a database for pages to use
working on the form submission- not working yet
added mysql upload and display for photos page
code review changes
updated for coding standards during code review
code review changes
Minor changes to contact.twig
form works now
Form send to database and contact.twig reads from database
Merge branch 'local_chris' into chrisdlangham

Conflicts:
	composer.json
	composer.lock
	features/ContactPage.feature
	views/contact.twig
	web/index.php
Fixing merge conflicts
fixing styling
added pdo options to display exceptions instead of erros
changed about page text to be left justified
Changed the post it and music page title to "Our Music" and changed relevant tests
worked on login functionality
Merge branch 'integration' of https://github.com/agilemusicproject/agilemusicproject.com into chrisdlangham
successful test and contact page has contact form