initial Commit
Merge branch 'master' of https://github.com/SaumilP/bSite

Conflicts:
	.gitignore
	new file:   .idea/IdeaProject.iml
	new file:   .idea/codeStyleSettings.xml
	new file:   .idea/compiler.xml
	new file:   .idea/copyright/profiles_settings.xml
	new file:   .idea/encodings.xml
	new file:   .idea/highlighting.xml
	new file:   .idea/libraries/SBT__cglib_cglib_nodep_2_1_3_test.xml
	new file:   .idea/libraries/SBT__ch_qos_logback_logback_classic_1_0_13.xml
	new file:   .idea/libraries/SBT__ch_qos_logback_logback_core_1_0_13.xml
	new file:   .idea/libraries/SBT__com_fasterxml_jackson_core_jackson_annotations_2_2_2.xml
	new file:   .idea/libraries/SBT__com_fasterxml_jackson_core_jackson_core_2_2_2.xml
	new file:   .idea/libraries/SBT__com_fasterxml_jackson_core_jackson_databind_2_2_2.xml
	new file:   .idea/libraries/SBT__com_github_scala_incubator_io_scala_io_core_2_10_0_4_2.xml
	new file:   .idea/libraries/SBT__com_github_scala_incubator_io_scala_io_file_2_10_0_4_2.xml
	new file:   .idea/libraries/SBT__com_google_code_findbugs_jsr305_2_0_1_test.xml
	new file:   .idea/libraries/SBT__com_google_guava_guava_14_0_1.xml
	new file:   .idea/libraries/SBT__com_h2database_h2_1_3_172.xml
	new file:   .idea/libraries/SBT__com_jolbox_bonecp_0_8_0_RELEASE.xml
	new file:   .idea/libraries/SBT__com_jsuereth_scala_arm_2_10_1_3.xml
	new file:   .idea/libraries/SBT__com_ning_async_http_client_1_7_18.xml
	new file:   .idea/libraries/SBT__com_novocode_junit_interface_0_10_test.xml
	new file:   .idea/libraries/SBT__com_typesafe_akka_akka_actor_2_10_2_2_0.xml
	new file:   .idea/libraries/SBT__com_typesafe_akka_akka_slf4j_2_10_2_2_0.xml
	new file:   .idea/libraries/SBT__com_typesafe_config_1_0_2.xml
	new file:   .idea/libraries/SBT__com_typesafe_netty_netty_http_pipelining_1_1_2.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_anorm_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_cache_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_datacommons_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_exceptions_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_functional_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_iteratees_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_jdbc_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_json_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_play_test_2_10_2_2_3_test.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_sbt_link_2_2_3.xml
	new file:   .idea/libraries/SBT__com_typesafe_play_templates_2_10_2_2_3.xml
	new file:   .idea/libraries/SBT__commons_codec_commons_codec_1_3.xml
	new file:   .idea/libraries/SBT__commons_codec_commons_codec_1_6_test.xml
	new file:   .idea/libraries/SBT__commons_collections_commons_collections_3_2_1_test.xml
	new file:   .idea/libraries/SBT__commons_io_commons_io_2_2_test.xml
	new file:   .idea/libraries/SBT__commons_logging_commons_logging_1_1_1.xml
	new file:   .idea/libraries/SBT__io_netty_netty_3_7_1_Final.xml
	new file:   .idea/libraries/SBT__javax_transaction_jta_1_1.xml
	new file:   .idea/libraries/SBT__joda_time_joda_time_2_2.xml
	new file:   .idea/libraries/SBT__junit_junit_4_11_test.xml
	new file:   .idea/libraries/SBT__net_java_dev_jna_jna_3_4_0_test.xml
	new file:   .idea/libraries/SBT__net_java_dev_jna_platform_3_4_0_test.xml
	new file:   .idea/libraries/SBT__net_sf_ehcache_ehcache_core_2_6_6.xml
	new file:   .idea/libraries/SBT__net_sourceforge_cssparser_cssparser_0_9_9_test.xml
	new file:   .idea/libraries/SBT__net_sourceforge_htmlunit_htmlunit_2_12_test.xml
	new file:   .idea/libraries/SBT__net_sourceforge_htmlunit_htmlunit_core_js_2_12_test.xml
	new file:   .idea/libraries/SBT__net_sourceforge_nekohtml_nekohtml_1_9_18_test.xml
	new file:   .idea/libraries/SBT__oauth_signpost_signpost_commonshttp4_1_2_1_2.xml
	new file:   .idea/libraries/SBT__oauth_signpost_signpost_core_1_2_1_2.xml
	new file:   .idea/libraries/SBT__org_apache_commons_commons_exec_1_1_test.xml
	new file:   .idea/libraries/SBT__org_apache_commons_commons_lang3_3_1.xml
	new file:   .idea/libraries/SBT__org_apache_httpcomponents_httpclient_4_0_1.xml
	new file:   .idea/libraries/SBT__org_apache_httpcomponents_httpclient_4_2_1_test.xml
	new file:   .idea/libraries/SBT__org_apache_httpcomponents_httpcore_4_0_1.xml
	new file:   .idea/libraries/SBT__org_apache_httpcomponents_httpcore_4_2_1_test.xml
	new file:   .idea/libraries/SBT__org_apache_httpcomponents_httpmime_4_2_3_test.xml
	new file:   .idea/libraries/SBT__org_easytesting_fest_assert_1_4_test.xml
	new file:   .idea/libraries/SBT__org_easytesting_fest_util_1_1_6_test.xml
	new file:   .idea/libraries/SBT__org_eclipse_jetty_jetty_http_8_1_9_v20130131_test.xml
	new file:   .idea/libraries/SBT__org_eclipse_jetty_jetty_io_8_1_9_v20130131_test.xml
	new file:   .idea/libraries/SBT__org_eclipse_jetty_jetty_util_8_1_9_v20130131_test.xml
	new file:   .idea/libraries/SBT__org_eclipse_jetty_jetty_websocket_8_1_9_v20130131_test.xml
	new file:   .idea/libraries/SBT__org_fluentlenium_fluentlenium_core_0_8_0_test.xml
	new file:   .idea/libraries/SBT__org_fluentlenium_fluentlenium_festassert_0_8_0_test.xml
	new file:   .idea/libraries/SBT__org_hamcrest_hamcrest_core_1_3_test.xml
	new file:   .idea/libraries/SBT__org_javassist_javassist_3_18_0_GA.xml
	new file:   .idea/libraries/SBT__org_joda_joda_convert_1_3_1.xml
	new file:   .idea/libraries/SBT__org_json_json_20080701_test.xml
	new file:   .idea/libraries/SBT__org_scala_lang_scala_library_2_10_3.xml
	new file:   .idea/libraries/SBT__org_scala_lang_scala_reflect_2_10_3.xml
	new file:   .idea/libraries/SBT__org_scala_stm_scala_stm_2_10_0_7.xml
	new file:   .idea/libraries/SBT__org_scala_tools_testing_test_interface_0_5_test.xml
	new file:   .idea/libraries/SBT__org_scalaz_scalaz_concurrent_2_10_7_0_2_test.xml
	new file:   .idea/libraries/SBT__org_scalaz_scalaz_core_2_10_7_0_2_test.xml
	new file:   .idea/libraries/SBT__org_scalaz_scalaz_effect_2_10_7_0_2_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_android_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_api_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_chrome_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_firefox_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_htmlunit_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_ie_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_iphone_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_java_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_remote_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_safari_driver_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_seleniumhq_selenium_selenium_support_2_32_0_test.xml
	new file:   .idea/libraries/SBT__org_slf4j_jcl_over_slf4j_1_7_5.xml
	new file:   .idea/libraries/SBT__org_slf4j_jul_to_slf4j_1_7_5.xml
	new file:   .idea/libraries/SBT__org_slf4j_slf4j_api_1_7_5.xml
	new file:   .idea/libraries/SBT__org_specs2_specs2_2_10_2_1_1_test.xml
	new file:   .idea/libraries/SBT__org_w3c_css_sac_1_3_test.xml
	new file:   .idea/libraries/SBT__org_webbitserver_webbit_0_4_14_test.xml
	new file:   .idea/libraries/SBT__scala_2_10_3.xml
	new file:   .idea/libraries/SBT__tyrex_tyrex_1_0_1.xml
	new file:   .idea/libraries/SBT__xalan_serializer_2_7_1_test.xml
	new file:   .idea/libraries/SBT__xalan_xalan_2_7_1_test.xml
	new file:   .idea/libraries/SBT__xerces_xercesImpl_2_11_0.xml
	new file:   .idea/libraries/SBT__xml_apis_xml_apis_1_4_01.xml
	new file:   .idea/misc.xml
	new file:   .idea/modules.xml
	new file:   .idea/projectCodeStyle.xml
	new file:   .idea/scala_compiler.xml
	new file:   .idea/scopes/scope_settings.xml
	new file:   .idea/uiDesigner.xml
	new file:   .idea/vcs.xml
	new file:   .idea/workspace.xml
	new file:   .idea_modules/playSite-build.iml
	new file:   .idea_modules/playSite.iml
	new file:   logs/application.log
	new file:   project/project/target/config-classes/$27e70e1c8eacf2308820$$anonfun$$sbtdef$1.class
	new file:   project/project/target/config-classes/$27e70e1c8eacf2308820$.class
	new file:   project/project/target/config-classes/$27e70e1c8eacf2308820.cache
	new file:   project/project/target/config-classes/$27e70e1c8eacf2308820.class
	new file:   project/project/target/config-classes/$6ef8272e89143fb9c0cb$$anonfun$$sbtdef$1.class
	new file:   project/project/target/config-classes/$6ef8272e89143fb9c0cb$.class
	new file:   project/project/target/config-classes/$6ef8272e89143fb9c0cb.cache
	new file:   project/project/target/config-classes/$6ef8272e89143fb9c0cb.class
	new file:   project/project/target/config-classes/$8981865c5e292b65d99b$$anonfun$$sbtdef$1.class
	new file:   project/project/target/config-classes/$8981865c5e292b65d99b$.class
	new file:   project/project/target/config-classes/$8981865c5e292b65d99b.cache
	new file:   project/project/target/config-classes/$8981865c5e292b65d99b.class
	new file:   project/project/target/config-classes/$928b44293a41c208472f$$anonfun$$sbtdef$1.class
	new file:   project/project/target/config-classes/$928b44293a41c208472f$.class
	new file:   project/project/target/config-classes/$928b44293a41c208472f.cache
	new file:   project/project/target/config-classes/$928b44293a41c208472f.class
	new file:   project/project/target/config-classes/$ad721fc859d7aca6a2d6$.class
	new file:   project/project/target/config-classes/$ad721fc859d7aca6a2d6.cache
	new file:   project/project/target/config-classes/$ad721fc859d7aca6a2d6.class
	new file:   project/project/target/config-classes/$b81a0bb41805f1649bbf$.class
	new file:   project/project/target/config-classes/$b81a0bb41805f1649bbf.cache
	new file:   project/project/target/config-classes/$b81a0bb41805f1649bbf.class
	new file:   project/target/config-classes/$1a3e98716460ab9926f4$$anonfun$$sbtdef$1.class
	new file:   project/target/config-classes/$1a3e98716460ab9926f4$.class
	new file:   project/target/config-classes/$1a3e98716460ab9926f4.cache
	new file:   project/target/config-classes/$1a3e98716460ab9926f4.class