Merge pull request #14 from tihuan/master

Add js back to layouts/application.html.erb
Friendly test environment setup complete
Merge pull request #15 from tihuan/chore/setup_test_suite

Friendly test environment setup complete