modifed code to start file
Merge branch 'master' into andrew
change made to view for practice.
Merge pull request #1 from andredempsey/andrew

Test merge process
Merge branch 'master' into andre
updated database configuration