meta data
Merge branch 'master' of github.com:Tokanagrammar/tokanagrammar-dev
Merge branch 'master' of
https://github.com/Tokanagrammar/tokanagrammar-dev into gui

Conflicts:
	src/main/java/edu/umb/cs/api/APIs.java