update 10/30
Merge pull request #2 from ptwich2/master

Update develop so users can login
Add OPPM file.
Updating mainwindow
Fixed error 299.
Delete Android App Ideas.pdf
Delete Schedule4.mm
Merge eddieBranch to develop branch.
Adding Bresia's code 11/4
Merge pull request #6 from ptwich2/eddieBranch

Eddie branch
Update mainwindow.cpp

removing junk
Update mainwindow.h

removing junk
Update mainwindow.ui

removing junk
Update mainwindow.h

reverting wrong "removing junk" update
Reseting mainwindow
Merge branch 'develop' of https://github.com/ptwich2/StudentScheduler- into develop
Remerging UI code
Revert "Update mainwindow.ui"

This reverts commit f848361d161860105b810bf45a5c6b2a9ee085f6.
Updating UI code
Merge branch 'develop' of https://github.com/ptwich2/StudentScheduler- into develop

Conflicts:
	mainwindow.ui