Merged new UI code
merge
Merge branch 'master' of https://github.com/geneccx/cpsc410
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/cpsc410.iml
	.idea/misc.xml
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Added a check to make sure the file path is .py as there were many javascript or css files parsed through.  Switched the repo.