fix bug
Merge branch 'master' of https://github.com/mud-turtles-2014/Soapp

merge master
remove js issue
deleted comments out of js to resolve merge problems
fir merge?
Merge branch 'master' of https://github.com/mud-turtles-2014/Soapp
Merge branch 'master' of https://github.com/mud-turtles-2014/Soapp
merp
Merge branch 'master' of https://github.com/mud-turtles-2014/Soapp
fix typo to push
Merge pull request #123 from mud-turtles-2014/repo_refactor

Repo refactor