Consolidated urls/views
Merge pull request #1 from mepps32/master

Consolidated urls/views