Refactoring
Lint
Merge pull request #10 from kevinjqiu/refactoring-resources

Refactoring