fix routes conflicts
fix sign in authentication and custom sign in sign up routes
added angular
minor changes
fix conflcit
dsstore
fix conflict
fix name error
capybara set up and sign up page testing
sign up page testing complete
promotion relationship et up complete
facebook login successful
fic signout path to user_signout
foundation, styling
resolved conflicts
more styling, moved facebook button
style modification and foundation templates
error forms
Merge pull request #6 from me33dy/aaronbranch

most updated
resolve merge conflict