Fixed compiler errors.
Merge branch 'master' of https://github.com/sjdixon/spawncamping
Added untracked files.
Added untracked files.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# Your branch is ahead of 'origin/master' by 2 commits.
#   (use "git push" to publish your local commits)
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	new file:   feed.js
#	new file:   photo.js
#	new file:   session.js
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	../.project
Merge branch 'master' of https://github.com/sjdixon/spawncamping

Conflicts:
	core/views/login.jade