2014 07 08 - Neglect this commit
Merge branch 'master' of https://github.com/lenny64/flightgear-atc into bug/v4

Conflicts:
	.gitignore
2014 07 08 - Removing the "revert back to previous version"
Merge pull request #1 from lenny64/bug/v4

2014 07 08 - Bug/v4