let's try that with a semicolon
better logs
what happens if we reconnect every minute...
also error log
whoa not that (also let's use 'var')
okay, just no, not anymore
Merge branch 'dev'

Conflicts:
	server/app.js
Add documentation for the weird bug fix
Merge branch 'dev'
Merge pull request #14 from microhoods/master

Catch dev up
Change whitespace on a file
Change whitespace
Update basic routSpecs.js
Rig up serverside tests to work with gulpfile
Merge pull request #15 from KiaFathi/features/Kia

Features/kia