Adding Serializable implementation to User
Merge branch 'ugo' of https://github.com/ramirlm/PIUPIU into ugo
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into ramir
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into ramir

Conflicts:
	src/main/java/info/noip/piupiu/model/User.java
Show all followers and following users
Merge branch 'uira' of https://github.com/ramirlm/PIUPIU into ramir
Merge branch 'master' of https://github.com/ramirlm/PIUPIU into ramir
Recreating the User file
Merge pull request #37 from ramirlm/ramir

Ramir