Merge pull request #23 from hammadhaleem/develop

Minor bug fixes and addition / Deletion of certain things.
Removed unused imports
Merge http://github.com/echevemaster/fedora-college into develop