adjust css for social page, add map function on main page, add jasmine tests
Merge branch 'master' of github.com:gilbertodemelo/csci3130project

Conflicts:
	csci3130projectJavaFiles/src/java/AccessDB.java
	csci3130projectJavaFiles/src/java/Building.java
	csci3130projectJavaFiles/src/java/Character.java
	csci3130projectJavaFiles/src/java/Demo.java
	csci3130projectJavaFiles/src/java/Event.java
	csci3130projectJavaFiles/src/java/Game.java
	csci3130projectJavaFiles/src/java/Login.java
	csci3130projectJavaFiles/src/java/Menu.java
	csci3130projectJavaFiles/src/java/User.java

merge files