strutsified things a bit
strutsification continues
Merge branch 'master' of github.com:wyrllyn/JEEproject