Update admin.py

trial run by kethzi and priyanka
Merge pull request #29 from kezgil/master

Initial Commit by Ketz and Priyanka
Update features.html
Ignore

Demonstrating something......Ignorable
Merge commit '509611f'
Merge commit '3cf2054'
Merge commit 'dfd1cca'
Merge commit 'a37fe08'