committing before pull
solved merge conflict
fixed up conflicts
loaded third party JS, CSS and images; configured FB login button
fixed merge conflict in readme