Change wrong file extension
Merge remote-tracking branch 'origin/master' into rails4
BF empty magic standards
BF magic standards overriding
Unique army list units can be rename
Create LICENSE
Update and rename README to README.md
Merge branch 'master' into rails4

Conflicts:
	app/models/magic_standard.rb