added protractor
added better formatting for rails
removed scaffolded comments
merge
merge