Created a test class since I'm having some compilation problems
Rename Test to Test.java
Merge remote-tracking branch 'origin/master' into emily_local
package structure