Merge branch 'frijoles' of https://github.com/MetalFaceDev/unihub into dev2
Merge branch 'frijoles' of https://github.com/MetalFaceDev/unihub into dev2
changes
Merge branch 'markbeans' of https://github.com/MetalFaceDev/unihub into dev2
worked on home
added the weather stuff
Merge branch 'dev2' of https://github.com/MetalFaceDev/unihub into yulle
Merge branch 'markbeans' of https://github.com/MetalFaceDev/unihub into dev2
Merge branch 'frijoles' of https://github.com/MetalFaceDev/unihub into dev2
Merge branch 'dev2' of https://github.com/MetalFaceDev/unihub into markbeans
nicer index page images and finished bean access in mark's jsp's
Merge branch 'markbeans' of https://github.com/MetalFaceDev/unihub into dev2
Merge branch 'frijoles' of https://github.com/MetalFaceDev/unihub into dev2
put the weather information on home.jsp
Merge branch 'yulle' of https://github.com/MetalFaceDev/unihub into dev2
Merge branch 'markbeans' of https://github.com/MetalFaceDev/unihub into frijoles
Merge branch 'yulle' of https://github.com/MetalFaceDev/unihub into frijoles
WeatherSession doesn't break anymore, but sometimes the images still doesn't load
Merge branch 'frijoles' of https://github.com/MetalFaceDev/unihub into yulle
Merge branch 'dev2' of https://github.com/MetalFaceDev/unihub into yulle