PA-83 #comments: correcting chain of file processing
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev