Update
Merge branch 'master' of https://github.com/CMPUT302W14T04/Interface

Conflicts:
	2wiiSoftware/src/wiiusej/test/WiiuseJGuiTest.java
Merge branch 'master' of https://github.com/CMPUT302W14T04/Interface