content type fix
Merge branch 'master' of github.com:iRail/hyperRail into development
Removed code duplication
Cleaned up error codes in stationcontroller
clean up public dir
Added stations and refactored code towards this new structure
Fixed #38
Update StationString.php
Merge pull request #40 from iRail/development

Update StationString.php
authentication system
OAuth
merge conflict
gitignore .grunt
gitignore
Ready for merge with master
Merge
Merge
permissions fixed