done
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git
done
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git

Conflicts:
	app/controller/AccountController.php
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git
no changes
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git

Conflicts:
	app/controller/AccountController.php
Merge branch 'master' of https://github.com/mechanicalmind/swinteamzoopblofg.git

Conflicts:
	app/controller/AccountController.php
	app/controller/Controller.php
	app/html/homepage.php
	app/model/Article.php
Styling and article Changes