Revert 0d2fdb2..48fc0f9

This rolls back to commit 0d2fdb2c015c0ffd6c5bfe2f424173649b32907b.
Revert 48fc0f9..00f5ea2

This rolls back to commit 48fc0f9946ad7ebd944ff81287c05050adffb00d.
Added portals
Merge branch 'master' of https://github.com/cschloer/CS361-Spectrum

This reverts commit f9013181bf71b23b2e68c4ccac6a59ac713c6df0.