Development

Merging development to master for deployment to Heroku.