changed some routes got pages working
fixing local merge conflicts
Merge pull request #14 from kexline4710/final_mvp

Final mvp