Think I removed some whitespace in the routes so it says there's a conflict, but think this is ok
Merge branch 'development' of github.com:enumera/WDI_WIFI_LDN_JN_2014 into development
Commit before pushing up my styling changes