controllers file functions
Merge pull request #16 from magicgrl111/master

changes