Added a fuction
Added propel files
Merge branch 'diet' of github.com:kheaactua/mayofest into diet