changed the name of the functions from resourceAction to serveResource
Merge branch 'master' of https://github.com/ericSaksa/CapstoneLab.git
Merge branch 'master' of https://github.com/ericSaksa/CapstoneLab.git
Renamed ResourceAction to serveResource