Merged code from Beginners from 1/11/14
Merge pull request #7 from ZackAlfakir/master

Merged code from Beginners from 1/11/14
manually merged shifter code
deleted meta file
Merge pull request #8 from ZackAlfakir/master

deleted meta file
new gitignore
Merge branch 'master' of github.com:anidev/612-2014-advanced
merged master, took out test stuff