PA-99 #comments: cleaning up
Merge branch 'dev' of https://github.com/BP2014W1/rapid-prototype into dev
PA-99 #comments: moving docs