added animation via animations.css and and angularized version of jquery waypoints
merge conflict
merge conflict resolution"
updated gitignore file
fixed lingering DS_Store problem. They are no longer tracked.
more dStore prob
please ignore DS_Store
deleted DS_Store files
merge