test commit
Merge branch 'master' of https://github.com/deliaz1993/DB
...
before i try fixing controller stuff
fixed the forms yay
programs views changed a bit
Merge pull request #1 from deliaz1993/master

Project First Draft