Delete main.css
readme conflict resolved
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding
Merge branch 'master' of https://github.com/jeffpyke/seamless-wedding