Merge pull request #1 from AndrewLorente/projects

Fix merge conflicts and some test cleanup
Remove a leftward-padding column
Use Amazon S3 to store project images [#23]