scetch
Repull
Merge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype

Conflicts:
	LocationAppTestTest/src/com/example1/locationapp/test/CommentsModelTest.java
	Team11Prototype/LocationApp/project.properties
sbBill
testJunit
commit to merge bug
final commit

Merge branch 'master' of https://github.com/CMPUT301W14T11/Team11Prototype

Conflicts:
	LocationApp/src/com/example1/locationapp/SubCommetsRead.java
github merge test
github