Add Basic Logging
New Exception Handling
Add Logging
Merge remote-tracking branch 'origin/master' into Exception_Handling

Conflicts:
	app/Global.java
	app/controllers/Trends.java
	app/services/CodeTrendService.java
test timed method
Merge branch 'master' into client_back_end
Merge with Master
code refactor
Add Error Handling Test
Update test to use static class
Remove Tabs
Merge pull request #22 from carrielies/Exception_Handling

Exception handling
client calls completed
Merge branch 'master' into client_back_end

Conflicts:
	test/integration/IntegrationTest.java
tabs to spaces
Merge pull request #23 from ollyjshaw/client_back_end

Client back end