Feature development started;
Secure check;
Controller layer;
Sidefeature;
Conflicting sidefeature change
Merge pull request #1 from shaq1/feature1

Feature1