commented fir
Merge https://github.com/Astvaldur/ES-Project-Spring-2014
Merge https://github.com/Astvaldur/ES-Project-Spring-2014