controllers
Merge branch 'master' of https://github.com/tylernisonoff/ArtGenius
forgot
Merge branch 'master' of https://github.com/tylernisonoff/ArtGenius
fixed merge
added artist and year