Added file input functionality
Testing git commit
Merge branch 'dev' of https://github.com/imthinhvu/ZuulProject into dev